Merge "Match default color packing for captioning settings" into mnc-dev