Merge "Update app pair error strings with UXW-approved ones" into main