Merge "Allowing SurfaceViewHost to show up in layout inspector" into tm-dev