SF: Enforce a size limitation on SurfaceTracing
am: 738966bf16

Change-Id: I9eb5b40190dd763c5f6b8f60b842113dc7c4196c