Merge "Update display windowing mode when development settings change" into rvc-dev am: 962150b5a9

Change-Id: I9bc2bcb657b976848a4533533cbc19cfa94b1c1e