am a7c85d92: Take screen rotation into account

Merge commit 'a7c85d92351070605b93176c1f691f4f80321ad5' into gingerbread-plus-aosp

* commit 'a7c85d92351070605b93176c1f691f4f80321ad5':
  Take screen rotation into account