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

Change-Id: Ia5c1214aefa1b964d3b267e4cb0e9a889e4051d5