Merge "Switch autologin to ListPreference" into honeycomb