am e6a2c26b: (-s ours) Don\'t adjust scroll on focus changes. DO NOT MERGE

* commit 'e6a2c26bfe081ceec535358c8f36a556602b758a':
  Don't adjust scroll on focus changes. DO NOT MERGE