Merge "Keeping the lockdown state in sync with the notification list" into pi-dev