Merge "SurfaceFlinger: Scheduler: move reset callback to scheduler thread"