Merge "Hide footer for empty shade even if bubbles are present" into sc-dev