Merge "Synchronize MediaPreparer host download, attempt 2" into pi-dev