Merge "Delete app pairs on model load if flag is turned off" into main