Merge "Revert "Changing TonalSpot Chroma from 4 to 6""