Latest fixes for Android version

Fixes up issues with step counter stop working after so long :(