am 9ce19670: Merge "fix the layout oddness that occurrs in portrait mode"

* commit '9ce19670b2f2537304a33abbf062c0b92dd91da0':
  fix the layout oddness that occurrs in portrait mode