Merge "Ensure whenToDream setting is valid upon boot." into main