Merge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev
am: a2f747c57c

Change-Id: I86355ce39a012f9db3a688198bebeadd7bde15c6