Merge "Correctly fade sparkles in" into sc-dev