Merge "Revert "Use display information from layers trace on assertions""