Merge "Simplify main thread stack size initialization"