Merge "Increase thread suspension timeout for debug builds"