Merge "Disable ADPF CPU hints for SF unless active display is on" into tm-qpr-dev