Merge "If custom display settings path doesn't exist, fall back to vendor settings." into sc-dev