Merge "Use calling user ID when calling isDeviceLocked" into oc-mr1-dev