[automerger skipped] Merge "[DO NOT MERGE] Fix some visual jumps when swiping home" into qt-qpr1-dev am: 4461347e0e -s ours am: 72ace27c96 am: e845eb8566

Change-Id: Ie29f90577f703e3814bab1dc22ab6fcda9aa066b