Merge "(FrameCallback) Use uint32_t instead of unsigned int" into devel/master