Merge "Add Gpu composition info to FrameTimeline" into sc-dev