Simplify the calculation when there are inline editors
Merge pull request #7120 from adobe/tom/remove-viewport-hack

Simplify the calculation when there are inline editors