Merge "[Multimedia] MediaController API redesign."