Use UriDataSource in demo app.
Minor tweak to UriDataSource.
Avoid spurious preparing->idle->preparing transition in demo app.

Issue #81
Merge pull request #96 from google/dev

dev -> dev-hls