Merge "Ensure we bind to the correct app's agent" into main