Merge "Add SurfaceFlingerStuffing case to toString()" into sc-dev