Merge "hwc: Add secure display attribute"