Merge "Fixes icons in shelf scrolled due to exposed menu."