Merge "Load album art from URIs first" into tm-dev