Merge "Clarify two-phase constructions on two IME-related controllers" into main