Merge "Add internal Canvas save flags"