Merge "System notif channels updated on locale change" into pi-dev