[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: I78bb07cdba6446ae9fb21aa6cbcaa85df13ca93d