Merge "Call finishDrawing and notify when Window is removed or hidden" into rvc-dev