Merge "Add VidController junits"