Merge "Refactor obtaining display in SF main thread" into main