Merge "Added calls to startHandover and cancelHandover"