Merge "SF: avoid skipping waiting for the earliest time to present" into udc-dev