Merge "Fix mSubscriptionInfoEntity NullPointerException" into main