Merge "[MEP] Handle downloadSubscription with switchAfterDownload is set to true" into tm-dev