Merge "Null-check mNavigationBar when returning its view."