Merge "Remove Google Play specific search URIs from Settings." into klp-dev