Merge "Protect broadcasts we use to talk to settings" into pi-dev