for ToolBox Optimal Size use contents optimal sizes

Change-Id: I614c4fdb6478d1ca8e092dc742886190ec920b7d