Merge "Replace IMMS#mSettings with IMMS#mCurrentUserId (2nd try)" into main