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