d9435bcecc
* commit 'b4788fdbfdda97bd9cfd0e483276934114d9c438': Do not merge. Backport two fixes for InputMethethodFramework