Merge "Move GradientDrawable stroke fields back to grey list" into qt-dev