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