Jira issue# 693 has been fixed:
Returning from Android Contacts in "setup-contacts" goes back to "home-not-configured"
Merge commit 'ab92a62fce2f9b4229a02a37a2a167ff74c21ba7' into HEAD