am f93fc543: Merge "Float color matrix fixes" into klp-dev

* commit 'f93fc5437adaca8ae7f851d0824534e484120058':
  Float color matrix fixes