Merge changes I2ffb5621,I953468f1

* changes:
  Add todos for a/v intent filters
  Limit audio/video player to content: URIs for now