[DO NOT REVIEW] Fixes #7095,BZ961024 - Limit subscriptions to content view/environment