Merge "Abort queued-sleep transition if display shouldn't sleep anymore" into udc-dev