Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" into sc-dev