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

* commit '03698e6852ead5f9337fee268bd32f02ef51216f':
  Change the test case about SCREENLAYOUT_LONG  depending whether the navigation bar is displayed or not.