Merge "Add new category key for ConnectDeviceFrag" into pi-dev