Merge "Add overridable background color for  the shade" into main