am 056fe795: am a7c85d92: Take screen rotation into account

Merge commit '056fe7952ef930157ba79e5c247cec93de17ddc2'

* commit '056fe7952ef930157ba79e5c247cec93de17ddc2':
  Take screen rotation into account