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

* commit '6cd206b2aa0039c215fc0a4cc487471c4b3f1496':
  Relayout windows that handle their own config change.