Merge "Added the ability to test CanvasClients vs. XML layouts in software and hardware." into lmp-dev