Merge "[RONs] Fixes for promoted notification logic" into main