Merge "Avoid throwing ISE in Canvas#restore underflow"