Merge "SurfaceFlinger: some bug fixes on Scheduler"