Merge "Properly report that we're no longer playing after receiving event" into ics-mr1