Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev