Merge "Fix test fail after force trigger predictive back transition." into main