Merge "Revert "Removed lock of showInputMethodMenu when showing the dialog"" into udc-dev