Merge "[VRR] Fix trace begin/end in ViewRootImpl" into main