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

Change-Id: If2aed47efb194bd37ce6064a7c9b5e2b14b0592d