Merge "Move navigation bar logic to its own class"