Merge "Restore final canvas state after deferred flush" into jb-mr2-dev