Fix some Android switch in/out and exit issues.
Remove a comment that no longer makes sense.