Merge "Rename reverted+resubmitted sdk sandbox flag" into main