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

Change-Id: I6ef94f7df2035cecee57d2b7a916064d5203ea9c