[automerger skipped] Merge "Fix quickswitch flickers/ignored swipes" into qt-qpr1-dev am: a9012ea717
am: 15280b902c -s ours
am skip reason: change_id I5b392d9726a81c51718d2f94eee6cd4f78b61f69 with SHA1 8e8a376a62 is in history

Change-Id: I3b50408c4c8a8aa6ec0112194ffbc44bf9223cd6