Merge "Conditionally initialize IMMS#mCurrentUserId with a main user" into main