Merge "Enable "wait_until_true" when used ouf the main thread"