Merge "SurfaceFlinger: Layer::shouldPresentNow should consider early frames"