Fix race condition btwn row and shelf icon init

Fixes: 154228740
Test: manual
Change-Id: I4bedcc9c50817418a49c4a69d3132c01720cd206
2 files changed