Re-add settings icon, back button for pref. activity in action bar.

Commented out code for enabling the action bar icon as a back button in
the pref. activity. Need to look at the Google docs to see if that's
typical or for user's to just use their phone's back button.