Merge "Remove "Hotspot" key from settings search if not needed" into tm-qpr-dev