Revert "Use the new PreferenceDrawerActivity to make use of the navigation drawer UI"

This reverts commit 9c4ba9c12fa97855db9c3313a75145f354ba97a5.
Revert "Missed One File for NavDrawer"

This reverts commit c346fb38b989356b3aec5fd1ae615b904a636472.