Merge "Blacklist doze setting from tuner reset" into pi-dev