Merge "New isSubscriptionVisibleFlow" into main