Merge "Revert Accidental tweak of work profile behaviour" into main