Merge change 880 into donut

* changes:
  Switch Music app to use the new 'fancy' search uri internally, and the 'basic' search uri for system search, instead of using the less efficient legacy uri for both.