Merge "Change mFrameNumber to uint64_t"