Merge "Improve secondary volume mounts on user switch" into sc-dev