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

* commit '0dc0dab71024e07431eb6d20b6165822da734902':
  Improve performance of WindowState.toString()