Fix bottom bar issue for Android