Merge "Move IMMS#mCurrentSubtype to binding controller" into main