Merge "Skip gapless offload test when offload is not currently possible." into udc-qpr-dev