Merge "Remove unused hidden handover code." into main