Merge "Add Nav Button Disabling Behavior"