am 51cefb2e: Merge change 7889 into donut

Merge commit '51cefb2ef58e18acad800c9aa63c2a7eee4d9731'

* commit '51cefb2ef58e18acad800c9aa63c2a7eee4d9731':
  Ignore unneeded soft keyboard in ACTV height calc