Merge "Fix HWC2to1Adapter crashing dragon at startup"