Merge "[SF] Move the notifyExpectedPresentHint call to SF" into main