Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev