Merge "Do not access WindowManagerService#mCurrentUserId w/o lock." into mnc-dev