Merge "Some UI updates to timer RON per the initial UX mock." into main