Merge "Remove contentDescription attribute in filter icon" into udc-dev