Merge "Adding root_task_for_bubble flag" into main