Merge "Don't allow core uids to be unfrozen due to deferrable broadcasts." into udc-qpr-dev