Merge "Provide proper transform to mask canvas" into sc-dev