Merge "Limit ordering unlock and wake by configuration." into udc-dev