Merge "Show account name as a single line string." into tm-qpr-dev