Merge "Refactor ripple components, simplify background animation"