Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev