Merge "QQS: Fix ripple clipping" into nyc-dev