Merge "Only use zparenting for drawing rects." into main