Android: Consistent behaviour exiting immersive view via single tap or system gesture

Fixes #511