Microsoft merges its Windows and Surface teams under one leader