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

Change-Id: I567e04d71350c8176a9b39f776fc3ba356c253fa