am 565d10c: Merge change 880 into donut

Merge commit '565d10ccc3a260f6929ada5a5f59d9429e3c0fcf'

* commit '565d10ccc3a260f6929ada5a5f59d9429e3c0fcf':
  Switch Music app to use the new 'fancy' search uri internally, and the 'basic' search uri