Merge "Allow sysui navigation to work when application occludes keyguard" into nyc-mr1-dev