Merge "Swipe for notifications should work when navigation occludes keyguard" into oc-mr1-dev