Merge "[RONs] Allow text color spans when promoted" into main