Merge "Better debug info for layers." into honeycomb