QuickSettings: merge bugfix