Merge "Reset patterned animations when solid ripple is reset" into sc-dev