Merge "Fix max height for settings_entity_header"