Merge "Ensure currentState is copied to drawingState for offscreen layers" into qt-dev