Merge pull request #12622 from mitaclaw/branch-watch-dialog-errata BranchWatchDialog: Fix Misc. Errata
