Merge "Fix oscillating DREAMING states" into main