Fix clip rect calculated incorrectly after popping