Merge "Expansion amounts based on scene transitions" into main