Merge "Migrate PiP2 flag to aconfig" into main