am 640279e7: Merge "add better support for landscape mode + minor cleanups"

* commit '640279e73b6128a83e4e0801f43334ae5ef3ccf6':
  add better support for landscape mode + minor cleanups