Merge "Fix bug #13058470 Cannot add account -- Settings app crashes"