Merge "media: Handle STOP action properly." into oc-dev am: 02b96f062a
am: 50c746b820

Change-Id: I4d356bb6e8c81d95a37038f27fe364218e217fbe