[master 2/2] Wrap device labels earlier (#1212586)