Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev