Merge "Adjust ripple opacity again"