Merge "Fix Emulator HWC2 crash"