Move advanced and hfm settings, hfm update

Change-Id: I80e0cc45d9a1b9d90a67a358104f4f42011f89a3
Notification Settings

Change-Id: I8ec62441622144b5a7240d48cc1d7dc9ef20ed64
ActiveDisplay: Use SwitchPreference

Change-Id: I3b33a60e80ceab98a85aa375428300b6ff79382b