Merge "Update system notification channels" into pi-dev