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

Change-Id: Ibd031067e7dbc4fd327185f9040d0ab337ac5923