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

Change-Id: Ia51b9e17765b599950dd168c90e4c89e0688049e