Merge "Fix showing keyboard without editor focused in some cases (2/2)"