Merge "CP: Fix geometry shader support check am: 0da63cfe1d am: 705c0dd3b0 am: 63ed9c...