Merge "Add media services to ephemeral_app" into oc-dev