Merge "Match disabled components for screenshot listeners" into udc-dev