Revert "Synchronize window config updates (7/n)"

This reverts commit def520df682bfb9e54137814b6f5f03393f93ef4.

Reason for revert: b/306516469

Change-Id: Ic1bebe5ec32a40618cffea3339e02bfcdbc02dd3
8 files changed