text: Title: Automated cherry pick of #79114: crd-handler: level-trigger storage recreation and fix a race
  Body: Cherry pick of #79114 on release-1.15.
  
  #79114: crd-handler: level-trigger storage recreation and fix a race