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