Base: Fix navigation issues on Android