Merge "Factor out to NavigationBarController#scheduleRelayout()"