Merge "Track maximum layer depth in a GOP"