Merge change Ie25ac73d into eclair-mr2

* changes:
  Fix "back key" flow for Email account setup