Merge "Update tracking bug numbers for predictive back flags" into main