Merge "Fixed that the shelf was animating the icons" into oc-dev am: 214f4cff15
am: 613d0b2beb

Change-Id: Ib2e9b5cb92c7d1817da4dc6857d341bb5e8188bb