Merge "Add tracing to DisplayListener impls" into main