Merge "Improve log messages when CE key is already protected by secret" into main