Merge "[Predictive Back] Clean up flags" into main