Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev am: 96b2fe6a4e
am: e19f2f2fc9

* commit 'e19f2f2fc982313a102d9102c2f658fb8ba16cae':
  Fix a few issues with ime adjust/minimized dock stack

Change-Id: I964a390dcd8204107f8062c7b0b361e5f82d91fc