Merge "Change default behavior to assume sampled chroma"