Merge "Move adjacent tasks forward together to ensure occluding state" into sc-v2-dev