Merge "Fix bug #3338957 (Account Picker and Account type picker need love)" into honeycomb