Merge "Revert "Atomic updates, icon cleanup for overflow"" into rvc-dev am: 64b2a0aae9

Change-Id: I32477b83979ed9a65308571997a9b179899dcc50