Merge "Adjust max cross fade radius to new blur radius range" into sc-dev