Merge "Enable single hop screenshots for only threaded re" into main