Merge "SF: Add back debug control of HWC use"