Merge "Add scene transitions from Dream to Shade and Bouncer" into main