Squashed commit for Music rating icon and lint errors