am 5ae8e45f: Merge "Make DimLayer track changes to WindowState layer."

* commit '5ae8e45ff390d660c5694f27e2df14cf7b8fb81d':
  Make DimLayer track changes to WindowState layer.