Merge "Add error logging and better crash safety for app pairs" into main