Merge "Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev am: 5da7a4a3f0 am: 0f1ed72a9a" into nyc-mr1-dev-plus-aosp