Merge "Updated media transport controls" into gingerbread