Merge changes I1dee45ba,I05129db8

* changes:
  Fix viewer screen recording
  Fix disappearing labels in SurfaceFlinger rects view