Merge "[Settings] Replace ImsDirectQuery"