Merge "Update preview thumbnail video badge" into udc-qpr-dev