Merge "Replace IMMS#mSettings with IMMS#mCurrentUserId" into main