Merge "OPP: Fix "0%" progress even after file transfer finished"