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