Merge "Delete SettingsDrawerActivity entirely."