Merge "Restore the legacy protocol between IMMS and KeyboardLayoutManager" into main