Add templates from toolbar

Change-Id: I0aa21bed13d1dbc693c1db03eab903af55a1517a
Merge "Add templates from toolbar"