Merge "Save/restore display lists' canvas properly"