feature: Avoid shelf flicker on initial load