Merge "Fix work toggle button to be placed where it should be." into tm-qpr-dev