Merge "Add missing PreferenceLayouts when querying item type" into mnc-ub-dev