Merge "Revert "Add RippleRevealEffect"" into main