Merge "hwc: Add assertive display support."