Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev