Merge "Add back a SYNC_SETTINGS screen" into jb-dev