Merge "Raise SurfaceControlFpsListener to System API."