Merge "Move setup optimization mode to main thread"