Merge "Add retries in restoreTrack_l if the track does not start" into pi-dev