Merge "SurfaceFlinger/LayerRenderArea: Hold lock while modifying hierarchy" into tm-dev