Merge "Use display windowing mode if undefined" into rvc-dev am: 0b74287b am: 6fb735c4 am: fdb95dd0 am: 06473295 Change-Id: Ic092809c5c1bab48f32da6e8c101a419510de1d0