Merge "Apply pending-intent op before blanket locktask check" into udc-dev