Merge "sdm: Fix CPU hint toggling issue"