Merge "Fix crash in RenderLayer due to null pointer" into honeycomb