Merge "Fix 3d Adapter launches"