Merge "Fix a bug where slotId was used instead of subscription ID" into main