Merge "Add container for full preview buttons" into sc-dev