Merge "Remove secondary color from scrim" into qt-dev
am: ea461d3c4f

Change-Id: I489d6bc4ec466e468ffdf31745d8a199a47cfe31