Merge branch 'release-21.0.0' into develop
Bring the play button closer in line with (proposed) AnkiDroid
Bumped version
Merge branch 'release-21.1.0'