Merge "Set conversation icon x at shelf start when fading into shelf" into sc-dev