Merge "overlay: Remove optimization that prevents garbage collection"