Merge "Ensure currentState is copied to drawingState for offscreen layers" into qt-dev
am: 38c6856ba3

Change-Id: I661e2af255a5a2fbb5e3796df483a94e9be96a88