Merge "Tweak figure styles based on visual diff testing"