Merge "Remove and cleanup AppPairs flag" into main