Settings : Make search locale friendly

Change-Id: I3ae4b074af7a0ab4105f35d3ee8d6e5ef004af3d

Conflicts:
	AndroidManifest.xml