Fix for autolay
Merge branch 'rr-videoupdate' into staging