Merge "Updates the dim for USER_SYSTEM if mCurrentUserId = null" into main