Merge "LayerStats: Fix a use-after-free" am: e801477145
am: 3d6136d01e

Change-Id: I4a20f62c645e08d236bc93636f3f48a3bf98e2dd