Merge "hwc: Add support for Secure display"