Merge "Fix typo in ImeVisibilityStateComputer" into udc-dev