Fix tile color issues

Test: manual
Fixes: 183888161

Change-Id: I818d41246c892a2cb211170afadc110930f40ab1
2 files changed