Merge "Swipe for notifications should work when navigation occludes keyguard" into oc-mr1-dev am: 3e3e05c933
am: 8933600f0b

Change-Id: I532513507f687df1051fd29f2d6a6204dd063f1e