Merge "Merge "Define priority for video threads" into oc-mr1-dev am: 70ab6cb0" into oc-mr1-dev-plus-aosp