Merge "add a way for the sync adapter to specify the activity that should be invoked to reach a settings screen for that sync adapter"