Merge "Revert "Do not refetch pin length"" into udc-qpr-dev