Merge "New media button API." into jb-mr2-dev