Merge "thermal: Fix throttle/release step bypass issue" into tm-qpr-dev