Merge "Revert "Atomic updates, icon cleanup for overflow"" into rvc-dev