Merge "Add scrim below TaskMenu" into sc-v2-dev