Merge "[RONs] Update notification colors" into main