Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread