Merge "Add APIs to indicate which subscriptions should be hidden from user"