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

Change-Id: I8c487469f67b17f02067520e7b90835627d394fa