Merge "Support configurable fade properties" into main