Merge "Avoid overriding doze screen-state reason to default" into main