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

* commit 'd23b2747eff9ae3203f96039794068e9f1b0c71b':
  Finish current Canvas operations then resume previous Canvas Bug #8297260