Merge "Make the sync adapter driver understand the new settingsActivity parameter."