Merge "Create display context when switching IME to new display for AOSP IME"
am: 9ab8c21cb8

Change-Id: Iba1d43a5f1c264782f318986dcbb19235409d476