Wow, you just made me realize how damn emotional it would be if Galen was found on Scarif by Jyn. Instead of random romantic hands scene between Jyn and Cassian, it would had fit SO MUCH better if Jyn was crying and hugging Galen as their final moments slip away into the explosion left by the Death Star.
Dammit, I KNEW something felt wrong when Krennic didn’t take Galen by force aboard his shuttle. THAT could had been the excuse to take Galen to Scarif for imprisonment/interrogation and forcing Galen to expose all of his message logs.