Merge "Fix work tile setup when adding work profile" into tm-qpr-dev