Merge "SF: do not wait for LastCompositeEventThread if it is not used" into main