Merge changes Ib00124b3,Ie850a67c

* changes:
  Refine WindowManagerInternal#getDisplayImePolicy
  Reduce potential lock contention during start input