Merge "Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE" into main