am b0c2615a: Merge "Update media controller sample." into jb-mr2-dev

* commit 'b0c2615abb4e89a10bc0cb777e704805efc123b6':
  Update media controller sample.