Merge "Cleanup offload controls doze autobrightness flag" into main