Merge "Do less on the main thread" into udc-qpr-dev