Merge "Support handover retry"