Android: fix crash when restoring with other info in the bundle

Fixes an android crash when starting on some devices. Also some cleanup
to the back stack arrangement. More changes would be good but might as
well fix the crash now.