Merge "Merge "Apply IME adjust to newly added window" into nyc-dev am: 7095d92afc am: 7f42c31e2f" into nyc-mr1-dev-plus-aosp