Merge "Fix drawing issues with layers."