Merge "Fix race condition btwn row and shelf icon init" into rvc-dev