Merge "Update configuration whenever the visible window is laid out." into oc-mr1-dev am: bbdc422b am: e3bcc711 Change-Id: I00682b46c5a6e401c627bb0d1869202655da17fa