Merge "Set stage outline layer to top" into sc-v2-dev