Merge "Improve SurfaceFlinger PTS estimation"