Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev