By: Michael Lynch <git@mtlynch.io>
Merge origin/master into slice-2.5 Resolve the media handler conflict by keeping adjacent media prefetching from origin/master while restoring the unified MediaFiles API.
| Time to Start | Worker time | Duration | Time to finish | |
| Config | 2s | 7s | 7s | 9s |
| Eval | 7s | 51s | 51s | 59s |
| Build | 13s | 4m42s | 3m08s | 3m21s |
| Suite | 2s | 5m41s | 3m19s | 3m21s |