Merge "Add profile badges to screenshot UI" into tm-qpr-dev