[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 am: 8326e6f9c2 -s ours
am skip reason: subject contains skip directive

Change-Id: I49c8f8e1350ac55bafdac5172946734e9eb68307