Merge "DO NOT MERGE Revert "Fix showing keyboard without editor focused in some case..."" into rvc-qpr-dev