Add separate OverlayCanvas class and update OverlayTest
Fix changes to OverlayTest

Conflicts:
	Samples/Tests/OverlayTest.cs