Commits
Philip Milne authored and Jim Miller committed 6b248641fc5
Update to fix for bug 5393156
Tweak to the logic to take account of margins when gravity = FILL is used and
there is a measurement dependency between the axes (as in mulit-line text).
Cherry pick ecab1178648670f2c72b47faf250040fcded3d13 to MR1
Change-Id: Ic0c95a4618bdb32acca75219796c66c1fc467610