Merge "Fix potential use-after-free in LayerUpdateQueue"