Merge "Do not recreate navigation bar for screen layout change"