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

Change-Id: I8221d18deed280c08d93739bcaf24bca0454b302