Merge "Call SF#processDisplayChangesLocked in testable SF" into main