Merge pull request #518 from stowellm/ms516

Splash makes sense, labels on fields in Automatic
Merge pull request #519 from stowellm/ms516

 Android Data Collector control flow and usability update
Field dialog states experiment number and title in it