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