Merge "Merge "Fix a few issues with ime adjust/minimized dock stack" into...
Merge "Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev am: 96b2fe6a am: e19f2f2f" into nyc-mr1-dev-plus-aosp
am: ba79d8a3
* commit 'ba79d8a3':
Change-Id: Ifa144f25761768aef92cdbf8bfc49a80f63874b8