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

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

Change-Id: I9f3f19c09a9f83b0a72bff4a26489b240af630a8