Merge "Restored default behavior of GradientDrawable orientation"