Merge "Don't update persistent msgs when dozing"