Merge "Migrate predictive back flags to aconfig" into main