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

Change-Id: I76768812fce770cc640702e314cc9f74bd5fb39d