Merge "Adding color back to popup container." into sc-dev