Merge "hwui: pass framenumber with FrameTimelineInfo"