Merge "Settings: Add zen rule name warning text." into mnc-dev