Merge "Restart the user only after the key is evicted." into qt-dev