am 482e8730: (-s ours) am 1214af3f: DO NOT MERGE - fix scroll bug

* commit '482e8730e9020c76f114206dbcc83e907f5f6686':
  DO NOT MERGE - fix scroll bug