Merge "Fix bug #2987804 (Provide a better UI for selecting the Backup account)" into honeycomb