am 41a4704b: Merge "Small tweaks to orientation." into jb-dev

* commit '41a4704b09f98723f4ddec895c9f2e651a5c0c8e':
  Small tweaks to orientation.