Merge "Updating deep shortcut container to new width." into sc-dev