Merge "Clean up manager record logs for binder exceptions" into main