Re-add QuickSettings.java after lastest cherry-pick