Merge "Fix 6028595:  Fix reboot loop in AccountUnlock due to null callback"