Merge "Enforce policy for camera gesture in keyguard" into oc-dev