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