Merge "libhwcomposer: Enhance mixed mode composition."