Merge "Update display windowing mode when development settings change" into rvc-dev am: 962150b5 am: d8eedf05 Change-Id: Ic293c4b4ae3ea72bfeb50eaf639aa665b5bdf5e9