Merge "[PB] Unify predictive back transition." into main