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

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