Merge changes Ia40a682c,I3118310a

* changes:
  DisplayImeController: reapply visibility when leash changes
  DisplayImeController: Refactor for testability