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

Change-Id: Iee350d5a32d2b6931421cf1f0167d264107d2622