Merge "Fix the name of the constant for device [dis]connect parameter"