Merge pull request #22529 from justindarc/bug1040952

Bug 1040952 - Camera/Video should use Color layer for background
Merge pull request #22539 from nullaus/bug1047609

bug 1047609 - Land 60x60 version of new System App icon. r=kgrandon