Droid: Search namespace shuffle.
Continued reshuffle of Search namespace. Fixes previous issues
Merge with latest WorldPins changes