Merge "Improve swipe to show notification menu gesture" into oc-dev am: aa94a61c56
am: b4809f27e7

Change-Id: Iab5388ffe09840d66aea0f4914582466cac44000