am 1214af3f: DO NOT MERGE - fix scroll bug

* commit '1214af3f8651d9a936b182b52d5f07734e28828b':
  DO NOT MERGE - fix scroll bug