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