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

Change-Id: Ie9dc641bd908758d30ae9f0e83182ee4f6036c19