VP-291: Making components configurable by changing their demands blocks in the VideoPlayer. Fixing options to eliminate infinite loops after options merging.
Merge remote-tracking branch 'alex/VP-291'

* alex/VP-291:
  VP-291: Making components configurable by changing their demands blocks in the VideoPlayer. Fixing options to eliminate infinite loops after options merging.