Merge "Improve robustness when migrating from appops xml" into main