Init surface after toolbar is setup vs. before.

This fixes all tools being loaded with proper state on mw integration.

Bug: 50141
Change-Id: I501b1efec2a2eedbf16a191a8be6b96b02290e09
Merge "Init surface after toolbar is setup vs. before."