Merge "Fix quickswitch flickers/ignored swipes" into qt-qpr1-dev
am: a9012ea717

Change-Id: I06b5e3b8baa2a4d1041dfe9a99ad530c02d2229d