Merge "Hide branding view when empty" into sc-dev