Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread