Merge pull request #16430 from theres-waldo/master

Bug 964517 - Add solid background to apps where appropriate. r=alive