1499630fb7
For OCL, keep original control logic
FOr HIP, keep the fix for SWDEV-338781
Change-Id: I89de8d1e73cd103b3b4f62206eed72d45695dd6e
[ROCm/clr commit: 0a43f6bff3]