Merge "Do not set tag as active if activated in listen mode" into main