Merge "Update popup container to match spec." into sc-dev