Merge "Update ripple mask when invalidated" into sc-dev