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

* commit 'b83630cad5e44e55add5c0464bab18f59e3d94db':