Carry 21716: When container had no layer data, cleanupContainer crashed Upstream-commit: 6bd429cb2aabfed7a39748aa3fefd047883f893a Component: engine