Merge "Revert "Avoid throwing ISE in Canvas#restore underflow""