DO NOT MERGE - fix scroll bug

   Bug 4262017

Change-Id: I0846a0336d23f6023ff23cae2ef598d40c52ecec
4 files changed