Merge "Settings: Remove zenswitch from DND settings page." into mnc-dev