Merge "catch null exception for filter event" into udc-dev