Merge "Fix problem with "Cancel" text not double-bolding" into main