This increases our APK size from 20MB to 28MB.
Closes #1417 (closed)
This will create a new commit in order to revert the existing changes.
