Merge "Create display context when switching IME to new display for AOSP IME"