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