Fix background color resolution

Test: manual
Bug: 174729670
Change-Id: Ib9fe70ea4be0a4b56ba9a964b8a08f4e48ebbd52
2 files changed