Android back button fixes, closes #454