Merge "Prevent overlap of color views in landscape" into mnc-dev