Merge "DecorView: Adjust light scrim" into qt-dev am: d532ef566d
am: 8c085104a2

Change-Id: I232f5db24c5dd2301360b28edfc7ef6b2806ba56