Merge "[Settings] Avoid rendering hidden preferences"