Merge "Move Canvas compatibility settings into Compatibility class"