Merge "Remove lock inversion in LegacyVpnRunner" into rvc-dev