Merge "Add overdraw debugging that accounts for Deuteranomaly" into klp-dev