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

* commit 'e6814331f7c7aae58c6396929ea13e216abd3dfe':