Merge "[Settings] Adopting public API"