Merge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev