Merge "Skip animating stashed handle color based on color sampling if it's the same" into main