Merge "Add null checks when registering backup transport" into main