Merge "Move GradientDrawable stroke fields back to grey list" into qt-dev am: 2516b14955
am: f6ff9ab3b5

Change-Id: I5c8de3335fe0c4cfbb5285342baca6d2df734523