Base: fix Editbutton and handle tracking on QuickSwipe

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