Merge change 7889 into donut

* changes:
  Ignore unneeded soft keyboard in ACTV height calc