Merge branch 'staging' into i-2564
2564: fixed video debug sync to YT functionality
Merge branch 'i-2564' into staging