Merge "media: clear pause state at stop()" into nyc-dev