Update Trebuchet overlay

Change-Id: I7f8c981f89a73d54c98a18140313722449939a1a