#3309435: Update to remove regressions introduced with #3309120 fixes, also updated EnqueueFormTest to use "claro" theme for testing instead of "classy", which is scheduled to be removed from Drupal 10