Merge "Reduce the number of getActiveSubscriptionIdList calls" into main