Merge "Use correct windowingMode when computing override config" into pi-dev am: fb699bcf1c
am: a5ed4289e8

Change-Id: If628457671e02e77099ecb2dafd8de4d2c7bb364