Merge "Refactor and clean up on blend_mask6" into nextgenv2