Merge "Ensure visibilities after TaskFragment WCT" into sc-v2-dev