Merge "Add slow fade-in to notification shelf icon to prevent overlapping icons in the shelf." into sc-dev