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

Change-Id: Ibf98552126e10870281281bcb20a4b649d400ef4