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

Change-Id: I5e9d6fd9fd877f51fea52ab759729278398caf54