Merge "Check for keyguard occlusion on camera lift" into oc-dr1-dev