Merge "UMS use mUsersLock to synchronized"