am 5de31846: am a1a1a1d6: Merge "Fix issue #6955586: No navigation bar in landscape on tablets" into jb-mr1-dev

* commit '5de318465192ec6edca8e1391f97515f13d20894':
  Fix issue #6955586: No navigation bar in landscape on tablets