Converge changes from OpenSpritz-Android