Merge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev