Merge "Ensure config callback is always removed in dream overlay" into main