Merge "Tie dream lifecycle to dream overlay" into main