Merge "Ensure deferred cleanup when display is off"