Merge "Fix style errors in inputMethodClientHasFocus()"