am c3665faf: (-s ours) DO NOT MERGE: Fixing regression where scroll position would be offset when rotated.

* commit 'c3665faf4525de78c64e1a98106e12f1c23810c9':
  DO NOT MERGE: Fixing regression where scroll position would be offset when rotated.