Merge "Support task ID for fps listener rather than SurfaceControl." into sc-dev