Merge "CanvasState frame init refactor"