Merge "Fix reference issue from the Theme and XML color in Gradient Drawable by"