Merge "Show navigation bar on external displays"