Merge "SF: wait instead of presenting early" into sc-dev