Fix OutputDevice::Pop

Change-Id: Iaaf19c01dc4ec10c72a66dac35ac64e37766d08e