Merge "Fix problems dispatching media button events on headless devices" into ics-aah