Merge "Keep HUN opaque for transition to shade" into sc-dev