Merge "Remove redundant logic about showing navigation bar"