[Upg] Do not store selected variant until it has been randmoly picked