Merge "Ensure waitOnMainUntil runs on the main thread" into udc-qpr-dev