Merge "Improve printing of Display- and Layer- Settings" into tm-dev