Merge "Select proper handover type and monitoring timeout duration" into main