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