Merge "Hide the expand container when it's not visible" into sc-dev