am 679ba4e8: am 6cd206b2: Merge "Relayout windows that handle their own config change." into klp-dev

* commit '679ba4e86e4fecb6dbfe48d6c49205c32f995a1c':
  Relayout windows that handle their own config change.