Merge "Create display context when switching IME to new display" am: 849ba2a546
am: be6edd0436

Change-Id: I1f3265cc82aa8274a2d107e812b9273502144583