fix soft reboot when setting up / switching users

Change-Id: I925ba8681dc2f51039a97e97c16f0f4c59ee8bce
Merge "fix soft reboot when setting up / switching users" into pac-4.4