This PR includes the changes from the 2.25 code freeze:
Version bump (It goes to rc-2 instead of rc-1 because the 151 version code that was initially used with rc-1 was actually uploaded a few months ago already to Google Play. So I upped the version code to 152 and made rc-2)
This PR includes the changes from the 2.25 code freeze: