Merge "Add status bar flag to disable quick settings" into mnc-dev