Merge "Clean up shouldHideSubscription API"