Merge "Remove main thread double hop from screenshots" into main