Merge "Introduce ImeFocusController"