Update layout calls and tests for canvas item layout changes.

Update layout calls and tests for canvas item layout changes. #792