Merge "Fade in shelf icons (replaces y-translation/scale/color-inversion)" into sc-dev