Revert "Atomic updates, icon cleanup for overflow"

This reverts commit e4274beadbad39dea3c9807ca0d8e10baf352fbe.

Reason for revert: causes b/156276800 -- lets revert in beta
Bug: 156115497
Change-Id: Ie3c8c5f0599ac4e2119553611ffd2f2cf9cf58f2
3 files changed