Merge "Create different KeyId for saved and suggestion network" into qt-dev