Merge "Disable shadow drawing for empty/null outlines"