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

Change-Id: If9aa281a7725685fdc60b75bb50020f3a3ec61e3