Merge "Updates following FrameCallback changes" into devel/master