Merge "Add option for video playback test to accept media source path." into jb-mr2-dev