Merge "More layout Canvas/Paint implementation."