Merge "Properly support handover retry"