Merge "SurfaceFlinger: fix wake up time when sf duration change"