Merge "Refine FocusHandlingTest and InputMethodServiceDeviceTest" into rvc-dev