Merge "TaskOrganizer: Wait for apps to draw." into rvc-dev