Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev am: cf988e3d64
am: f1c69ead73
Change-Id: Ib00c8325f8dbf5b54c8ab00b43fe42eccc89ccf0
This commit is contained in: