Merge "Make sure to reorder side stage above main stage to prevent flicker" into sc-dev