Merge "Fix USB mount issue after GOTA upgrade" into main