Merge "Update HWUI matrix API"