Merge "Fixed a bug with app provided media spans" into oc-mr1-dev