Merge "Move the persistent property set to IoThread"