Commit for canvas resizing and toggle toolbars

Change-Id: I88bb351467ef67a5afe7ffc2bdd2541ff2923c69