[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

Change-Id: I4be2fe5f5a906e1999d6a6b12752deef6d5af1fa