Merge \"Delete all* references to launcher clings.\" into ub-launcher3-calgary
am: b900f1cbaf

Change-Id: I7eb21f5515acb6b7efcb5c4821131c411b28f4d1