Merge "Hide emergency setting from "Search settings"" into tm-dev