Merge "cancel device discovery before start pairing process" into klp-dev