Merge "Rename IMMS#mCurrentUserId to #mCurrentImeUserId" into main