Merge 2.2.x and 2.x branches

No merge required. It turns out that, although the 2.2.x to 2.x comparison shows the logo change as a difference, the logo change is indeed part of 2.2.x.

The 2.2.x is the most up-to-date branch.

We can safely rebase 2.x from 2.2.x, then remove 2.2.x.

Maintainer may find the following helpful.

git fetch --all
git checkout --track origin/2.x
# skipped previously applied commit 8fb5e79, reapply-cherry-picks to include skipped commits.
git rebase --reapply-cherry-picks 2.2.x
# see that the branches now match at HEAD.
git log
# delete remote branch.
git push origin :2.2.x
# delete local branch.
git branch -D 2.2.x