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

Change-Id: I00682b46c5a6e401c627bb0d1869202655da17fa