Merge "Set the resource values of cutout path and rect to empty string in waterfall overlay" into rvc-dev