Fix cleanup of swapchain images in the shared case am: 31b85c2326
am: 74967004b5

Change-Id: I8cbe70f51fa999ab41548b3ba3fa835ba013de91