Merge "Remove mCurrentUserId dependency from switchToInputMethodLocked" into main