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