Merge "Use list instead of array when filtering non-app leashes" into sc-v2-dev