Revert "VP-297: Clean up naming in MediaSettings file"

This reverts commit 052e523b0b070c5a6d5f06f9527515d03ab81d2a.

Conflicts:

	js/MediaSettings.js
Revert "VP-297: Fix tests to use new model relay code. One test fails, properly."

This reverts commit 22331fba2e8ed003303eda4e7ec22ba2edd11fbe.

Conflicts:

	js/VideoPlayer_framework.js
	js/VideoPlayer_uiOptions.js
	tests/html/VideoPlayerTranscriptIntegration-test.html
VP-297: Temporary commit