Merge "Fix method tracing's handling of shadow frames on startup."