Merge "Fix crash: camera swap w/ custom Background video" into ics-mr1