Merge "sdm: update AVR states properly during mode switch"