Merge "Fix the order of applying layer alpha and color matrices in GLESRenderEngine"