Merge "Move stability flags to the stability namespace" into main