Merge "Fix remove-before-add for IpSecService RefcountedResource" into qt-dev