Merge "Use mDrawingState for printing hwc layers"