Merge "First draft of Scenes & Transitions feature"