Merge "Cleanup dream complication setting to reflect single toggle users see in Settings." into tm-qpr-dev