Merge "Fix shade not having a background when opened on an expanded bubble" into sc-dev