Merge "Support hasNavigationBar per display(1/2)"