Merge "Correctly make to spec the color for "Turn on work apps" button and add stroke" into tm-qpr-dev