Merge "Don't relayout based on a window that isn't visible" into lmp-mr1-modular-dev