Merge "Zen: Reset zen + ringer modes on upgrades to M." into mnc-dev