Merge "media: Handle STOP action properly." into oc-dev