Merge "Fixing flashing icon on delete, and offset of delete animation."