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