Merge "Cleaning in ListWithEditTextHeaderTest."