Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev