Merge "Toggle Home controls when user selects Home Control Panel Dream" into main