Merge "sdm: Reset pending_doze on new display state request"