am 3b10aea5: Merge "Improve performance of WindowState.toString()"

* commit '3b10aea50c1044ff33d02727829c47c061f6e1c8':
  Improve performance of WindowState.toString()