Merge "Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev am:...
Merge "Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev am: 5dbb9ff6 am: 7d4da18d" into nyc-mr1-dev-plus-aosp
am: 3b1e4502
* commit '3b1e4502':
Change-Id: I3f78f48f53e0844b45d5fe300e4c5c11e652afad