Merge "Standardize usages of "/" separator in SettingsLib"