Base: fix quick swipe

Change-Id: I5eaf8ed9674aa4c55082c2a317d51cc1de6d17fa
Merge remote-tracking branch 'omni/android-4.4' into android-4.4