Merge "Don't draw layers in buildLayer()"