Merge "Move setup optimization mode to main thread" into tm-qpr-dev