Merge "Settings: Calendar event zen rule string updates." into mnc-dev