Merge "Don't reset AZR condition when user updates a rule for watch" into main