Merge "Remove usage of isSubscriptionVisible() in getSelectableSubscriptionInfoList()" into main