Merge "Remove MEDIA_EXPLICIT_INDICATOR flag" into udc-qpr-dev