Fix Android nav issue