[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: f1d83509be am: 3e93552b6a

Change-Id: I869ea9f5c001cfc44432ba93dd65971aac9c18a4