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

Change-Id: Iec1ff6dd21641dd2d464a166e247c4c3e6791555