Merge "Cleaned up the usage of SubscriptionManger.getSubId" into main