* Use Theme.SubSettingsBase for theme
* Replace PreferenceActivity with CollapsingToolbarBaseActivity
* Add Titles to preference screen
* Remove onOptionsItemSelected and where necessary move to activity
Change-Id: I87af15f5e165aa7bcd556eb2b716c0ce624ca4e7