Merge "Fix shadow painting in layoutlib"