am dca46b50: Merge "Keep task stack when invoking settings from setup wizard"

* commit 'dca46b50151e435b061691dee3d7d95ea067d45d':
  Keep task stack when invoking settings from setup wizard