Merge "Inline NO_SORT_BY_INTERRUPTIVENESS" into udc-qpr-dev