Merge changes I5fd02510,I062f0005 into pi-dev

* changes:
  Change onboarding flow.
  Fix WifiWake locking behavior.