Merge "Improve performance of WindowState.toString()"