Merge "Track surfaceflinger CPU usage" into sc-dev