Merge "Add some more scenes, replace linear with uniform" into sc-dev