am 18d836b6: Merge "Don\'t relayout based on a window that isn\'t visible" into lmp-mr1-modular-dev

* commit '18d836b61811270bfae8cec6e0e782234dfcf5a4':
  Don't relayout based on a window that isn't visible