Shell/3758

A couple of upstream fixes needed to properly implement the desired background shading behavior.

endlessm/eos-shell#3758