Merge "Update ripple behavior, use render thread animation"