Merge "Fix 5x and 6P crash when using HWC2to1adapter"