Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes"