Merge "SF TimeStats: fix missed frame logic" into pi-dev