Merge "Check SurfaceControl in stats sent to transactionCallback" into sc-dev