Merge "Disable "next" targets in module release branch" into udc-mainline-prod