Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread