Merge "Improve doze transitions" into lmp-mr1-dev