Merge "SurfaceFlinger: cleanup conversion issues in Scheduler"