Merge "Add frame timeline to veil surfaces in maximize CUJ" into main