Merge changes Ie15c0abb,I14390a3d

* changes:
  SF: Adding sysprop flag for video detection
  SF: Updating video detection logic. This is V0.