Merge "Don't attempt to tone map content that is already in range." into sc-dev