Support color block for combined views

Change-Id: I3097cb4c37311cbe4b2b8702c26a7edf5eebdd24
5 files changed