Fix button index issues with ActionSheet on iPhone. Improve UI for SharedSyncController.
Merge remote-tracking branch 'origin'