Merge "Add support for updated HW composer interface"