Merge "SF: fix floating-point-exception in SurfaceFlinger::setCompositorTimingSnapped try 2" into tm-dev