Merge "Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb225 am: 88f92e10 am: 5878e9c4 am: 1e527197"