Merge "Properly use a long long literal to avoid under/overflow during fps computation."