Merge "Update configuration whenever the visible window is laid out." into oc-mr1-dev
am: bbdc422bb1

Change-Id: If0e29f5c031300ce24dc7ed875c9050ec5f9679a