Merge "Modify the device discovery status" into tizen