Merge "Wake notifications to TogglePreferenceController" into pi-dev