Merge "Video badging levels: @Deprecate and @remove" into oc-dev