Merge "Fixing button state not updated when NavBar is recreated"