Revert QuickSettings & NavigationBar commits