Merge "Fix unitialized field in HWC2on1Adapter"