Merge changes Id6fdfc53,If9d4134a into main

* changes:
  Remove flag single_hop_screenshots
  Reorder release fence attachment for non-threaded RE