Merge "HwcClient: Fix plane alpha"