Merge "[Multi-user] Remove dir management for non-system users"