Merge "Use display windowing mode if undefined" into rvc-dev am: 0b74287b am: 5a8c393e am: 16a0d90e am: 3c1453d9 Change-Id: I4ba0272620af0945f362cd312400cadc36ba1c35