Revert "Reduce number of binder calls by saving nav bar state"