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

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