Merge "Add calendar sync checkbox to account settings screen"