Merge "Improve export to bitmap layers for HierarchyViewer."