Merge branch '1912'

Authored by mardelle on Dec 23 2019, 6:30 PM.

Description

Merge branch '1912'

Merged Changes

CommitAuthorDetailsCommitted
e083567cc30cmardelle
Fix proxying of slideshow clips. CCBUG: 415448 
Dec 23 2019