Merge "Disable home control dream when flag disabled" into main