Merge "SurfaceFlinger: Add ClientCache dumps" into sc-dev