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

Change-Id: Ife785571c05fe0dbefe3bfb5dd7b081276c81a7c