Merge "Fix checks for showing InputMethod picker"