Merge commit '657bdd7d2851cd3b09f156c4abd085614efdc593' * commit '657bdd7d2851cd3b09f156c4abd085614efdc593': Fix CustomLocale to work with soft keyboard.
Merge commit '657bdd7d2851cd3b09f156c4abd085614efdc593' * commit '657bdd7d2851cd3b09f156c4abd085614efdc593': Fix CustomLocale to work with soft keyboard.