Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev