Merge branch 'release' of https://github.com/thunderbird/thunderbird-android into develop