Merge "Improve null safety for app pairs" into main