Adding code from the beta into the stable version of the Android app