Merge "Store uids in listener filters" into sc-dev