Merge "Adapt to refactoring of display config code in SettingsLib"