Merge "Change the test case about SCREENLAYOUT_LONG depending whether the navigation bar is displayed or not."