Merge "Improve transitions when replacing an overlay" into main