Merge "Fix private space settings cog margin" into main