[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

Change-Id: I24fb22503a049539e154091d1c138731840ba52d