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

Change-Id: I585646e332373566ab484424bb025c6974b6662b