Merge "Mark intent resolver as required for all users" into udc-dev