Merge "hal: Disable removal of QOS dynamically"