Just to pitch in, I recently flew SYD-DXB-GLA with 25h in Dubai seeing a mate. When trying to upgrade using miles I was not offered the reduced upgrade fee for combining both legs as it was treated as two separate tickets. On my return home to SYD, I had a 17h stopover and was able to upgrade at the reduced rate as it was one ticket.