Merge "Fix screenshot work profile badge padding" into tm-qpr-dev