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

Change-Id: I8be6491234a87a72cf47e9b99afe5237e2c7d43d