Merge "Show/hide the delete button when branches change" into stable-2.9